ChangeLog merge fixes

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 413361ffac155a06561a780b9345d5baab0e3e9f..3e56e0622cdbe41dc3208da0d5b44cfa9398df33 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,4 +1,4 @@
-2012-05-12  Andreas Schwab  <schwab@linux-m68k.org>
+2012-05-14  Andreas Schwab  <schwab@linux-m68k.org>
 
        * cc-mode.texi: Avoid space before macro in 4th argument of cross
        reference commands.  (Bug#11461)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6645b26abdaf5aae209a87a263ff78273cee2c3..d21fbd1d42613faac950ea8460716e6b90a2a19f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,3 @@
-2012-05-14  Troels Nielsen  <bn.troels@gmail.com>  (tiny change)
-
-       * progmodes/compile.el (compilation-internal-error-properties):
-       Calculate start position correctly when end-col is set but
-       end-line is not (Bug#11382).
-
 2012-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * net/rlogin.el (rlogin-mode-map): Fix last change.